unify(network): Move GameNetwork and GameSpy files to Core #1733

bobtista · 2025-10-23T14:29:46Z

Merge after fix: Replace strcpy with strlcpy for robustness #1712
Merge after unify(network): Merge GameNetwork, GameSpy and adjacent code #1735

Moved 69 identical network files from Generals/GeneralsMD to Core

xezon · 2025-10-23T14:38:35Z

Please make the unify a separate Pull Request.

bobtista · 2025-10-23T15:02:23Z

Please make the unify a separate Pull Request.

Done. Follow up PR with refactor is #1734

xezon

I am working on a change to try merge file contents in GameNetwork, which then means we can move more files here.

Core/GameEngine/CMakeLists.txt

xezon · 2025-10-23T20:20:03Z

I am working on a change to try merge file contents in GameNetwork, which then means we can move more files here.

Done. After #1735 is merged, we can move all GameNetwork + GameSpy files except GUIUtil.cpp

xezon · 2025-11-09T08:51:33Z

We can now do this move.

Generals/Code/GameEngine/CMakeLists.txt

xezon

Next time, prefer using the python script to move files. It gives more confidence that things are correct and is easier to repeat.

Core/GameEngine/CMakeLists.txt

…SpyGameInfo) back to Generals-only

xezon · 2025-11-09T19:58:34Z

Core/GameEngine/CMakeLists.txt

+    Include/GameNetwork/GameSpy/ThreadUtils.h
 #    Include/GameNetwork/GameSpyChat.h
 #    Include/GameNetwork/GameSpyGameInfo.h
 #    Include/GameNetwork/GameSpyGP.h


Are these unused like their CPP counterparts? If yes, can mark them so.

xezon · 2025-11-09T19:58:54Z

Core/GameEngine/CMakeLists.txt

+    Source/GameNetwork/GameMessageParser.cpp
+#    Source/GameNetwork/GameSpyChat.cpp # unused
+#    Source/GameNetwork/GameSpyGameInfo.cpp # unused
+#    Source/GameNetwork/GameSpyGP.cpp # unused


These 3 lines were touched when not so necessary.

xezon · 2025-11-09T20:01:57Z

Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals(tm)
+**	Command & Conquer Generals Zero Hour(tm)


3 header files were edited in Generals.

xezon · 2025-11-09T20:03:31Z

scripts/cpp/unify_move_files.py

@@ -127,44 +127,112 @@ def unify_move_file(fromGame: Game, fromFile: str, toGame: Game, toFile: str):


 def main():
-
-    #unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/crc.h", Game.CORE, "GameEngine/Include/Common/crc.h")


Please do not remove the old ones.

xezon · 2025-11-09T20:05:21Z

scripts/cpp/unify_move_files.py

-    #unify_move_file(Game.GENERALS, "GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl")
-    #unify_move_file(Game.ZEROHOUR, "GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl", Game.CORE, "GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl")
+    # GameNetwork Headers
+    unify_file(Game.ZEROHOUR, "GameEngine/Include/GameNetwork/Connection.h", Game.CORE, "GameEngine/Include/GameNetwork/Connection.h")


Add them in commented state here like the others. Is not really great but I did not have better idea when making this script. Maybe we should have new scripts for individual moves, calling into this script. Then it would not need this commenting approach.

bobtista mentioned this pull request Oct 23, 2025

refactor(network): replace manual size calculations with packed structs #1675

Open

bobtista force-pushed the bobtista/unify-network branch from 771b9a9 to d3c288d Compare October 23, 2025 14:44

bobtista changed the title ~~refactor(network): Unify identical network code and replace manual size calculations with packed structs~~ refactor(network): Unify identical network code Oct 23, 2025

xezon reviewed Oct 23, 2025

View reviewed changes

Core/GameEngine/CMakeLists.txt Outdated Show resolved Hide resolved

bobtista force-pushed the bobtista/unify-network branch from d3c288d to bb35461 Compare October 23, 2025 19:59

xezon changed the title ~~refactor(network): Unify identical network code~~ unify(network): Move GameNetwork and GameSpy files to Core Oct 23, 2025

xezon added Gen Relates to Generals ZH Relates to Zero Hour Unify Unifies code between Generals and Zero Hour labels Oct 23, 2025

xezon added this to the Code foundation build up milestone Oct 23, 2025

xezon mentioned this pull request Oct 23, 2025

refactor(network): replace manual size calculations with packed structs #1734

Open

bobtista force-pushed the bobtista/unify-network branch 4 times, most recently from f416fe8 to 6ac9e87 Compare October 26, 2025 03:45

bobtista force-pushed the bobtista/unify-network branch 3 times, most recently from fa77f30 to e1e625a Compare November 6, 2025 21:14

bobtista force-pushed the bobtista/unify-network branch from e1e625a to ebec515 Compare November 9, 2025 17:24

xezon reviewed Nov 9, 2025

View reviewed changes

Generals/Code/GameEngine/CMakeLists.txt Show resolved Hide resolved

xezon reviewed Nov 9, 2025

View reviewed changes

Core/GameEngine/CMakeLists.txt Outdated Show resolved Hide resolved

refactor: unify GameNetwork and GameSpy code to Core (except GUIUtil)

2b661e2

bobtista force-pushed the bobtista/unify-network branch from 9463a2f to 2b661e2 Compare November 9, 2025 19:17

fix(unify): Move obsolete GameSpy files (GameSpyChat, GameSpyGP, Game…

005449b

…SpyGameInfo) back to Generals-only

xezon reviewed Nov 9, 2025

View reviewed changes

		@@ -127,44 +127,112 @@ def unify_move_file(fromGame: Game, fromFile: str, toGame: Game, toFile: str):


		def main():

		#unify_file(Game.ZEROHOUR, "GameEngine/Include/Common/crc.h", Game.CORE, "GameEngine/Include/Common/crc.h")

unify(network): Move GameNetwork and GameSpy files to Core #1733

Are you sure you want to change the base?

unify(network): Move GameNetwork and GameSpy files to Core #1733

Conversation

bobtista commented Oct 23, 2025 • edited by xezon Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xezon commented Oct 23, 2025

Uh oh!

bobtista commented Oct 23, 2025

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xezon commented Oct 23, 2025

Uh oh!

xezon commented Nov 9, 2025

Uh oh!

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xezon Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bobtista commented Oct 23, 2025 •

edited by xezon

Loading